-
Notifications
You must be signed in to change notification settings - Fork 682
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add cherry-pick script #2106
base: master
Are you sure you want to change the base?
Add cherry-pick script #2106
Conversation
Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
/assign @andreyvelich @johnugeorge |
@tenzen-y Thanks for this. |
Yeah, we could support that command. But we need this script since we sometimes face git conflict. |
Pull Request Test Coverage Report for Build 9019416582Details
💛 - Coveralls |
Doesn't this action allow us to resolve conflicts ? Also, the Kubernetes script using
|
I don't think so. In general, Git conflict has never been automatically resolved.
This script is useful because creating cherry-pick PR as well. |
@tenzen-y We discussed on the recent Kubeflow Community Call that we want to enable cherry picking plugin for prow: https://docs.prow.k8s.io/docs/components/external-plugins/cherrypicker/. |
@andreyvelich Great to hear! I prefer to enable it in the prow. Please let me know once the cherry-picker is available. |
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. |
What this PR does / why we need it:
I added a cherry-pick script. This script is stolen from https://github.com/kubernetes/kubernetes/blob/57b406a18afc54c84725488e0ca3d4b4cabd61db/hack/cherry_pick_pull.sh
You can see example PR here: #2107
Which issue(s) this PR fixes (optional, in
Fixes #<issue number>, #<issue number>, ...
format, will close the issue(s) when PR gets merged):Fixes #
Checklist: